combobox: Remove unneeded checks
authorBenjamin Otte <otte@redhat.com>
Wed, 30 Apr 2014 06:39:06 +0000 (08:39 +0200)
committerBenjamin Otte <otte@redhat.com>
Thu, 1 May 2014 12:51:27 +0000 (14:51 +0200)
Size vfuncs always get non-null out variables passed, so no need to
check for NULL.

gtk/gtkcombobox.c

index 10b6575da278c1b8fc4b12134fae2495350ed4e8..c67912f6118818153a177dfd7d45f3e9e2734ea7 100644 (file)
@@ -5593,11 +5593,8 @@ gtk_combo_box_get_preferred_width (GtkWidget *widget,
   minimum_width += padding.left + padding.right;
   natural_width += padding.left + padding.right;
 
-  if (minimum_size)
-    *minimum_size = minimum_width;
-
-  if (natural_size)
-    *natural_size = natural_width;
+  *minimum_size = minimum_width;
+  *natural_size = natural_width;
 }
 
 static void
@@ -5732,11 +5729,8 @@ gtk_combo_box_get_preferred_height_for_width (GtkWidget *widget,
   min_height += padding.top + padding.bottom;
   nat_height += padding.top + padding.bottom;
 
-  if (minimum_size)
-    *minimum_size = min_height;
-
-  if (natural_size)
-    *natural_size = nat_height;
+  *minimum_size = min_height;
+  *natural_size = nat_height;
 }
 
 /**